From f06c84e0472b4a94883264432099b3858321c9bf Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 20 May 2015 15:38:56 +0100 Subject: [PATCH] xen: flask: Pass output directory as a parameter to mkflask.sh When called from the tools side in a later patch we will want to direct its output to the appropriate place. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- xen/xsm/flask/Makefile | 2 +- xen/xsm/flask/policy/mkflask.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 1256512171..12fc3a996b 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -22,7 +22,7 @@ ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES) $(obj-y) ss/built_in.o: $(ALL_H_FILES) $(FLASK_H_FILES): $(FLASK_H_DEPEND) - $(CONFIG_SHELL) policy/mkflask.sh $(AWK) $(FLASK_H_DEPEND) + $(CONFIG_SHELL) policy/mkflask.sh $(AWK) include $(FLASK_H_DEPEND) $(AV_H_FILES): $(AV_H_DEPEND) $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index e8d8fb5d2c..9e240209d1 100644 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -8,10 +8,13 @@ set -e awk=$1 shift 1 +output_dir=$1 +shift 1 + # output file -output_file="include/flask.h" -debug_file="include/class_to_string.h" -debug_file2="include/initial_sid_to_string.h" +output_file="$output_dir/flask.h" +debug_file="$output_dir/class_to_string.h" +debug_file2="$output_dir/initial_sid_to_string.h" cat $* | $awk " BEGIN { -- 2.30.2